Merge "Use String8/16 c_str [idmap2, androidfw]" into aosp-main-future am:...

Merge "Use String8/16 c_str [idmap2, androidfw]" into aosp-main-future am: 8ea8db8b am: 15476064 am: 13d7911e am: 11ed9e8d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24681232



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