Merge "Use String8/16 c_str [idmap2, androidfw]" into udc-dev-plus-aosp am:...

Merge "Use String8/16 c_str [idmap2, androidfw]" into udc-dev-plus-aosp am: 6ee36e2b am: 6655b76c am: e593ac80

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



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