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

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

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