Merge "Remove ImplicitStringConcatShapes template and generator from tests" am: 39970c887b am: cb81ad45f4 am: 86beada71d

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2052848

Change-Id: Ia77acd53bbbde50e94993d7920a4ddc035d07637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>