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

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



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