Merge "Fix ambiguous String8 conversion" into main am: 863fea81

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



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