[automerger skipped] Merge "[conflict] Merge "Migrate from android::String...

[automerger skipped] Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce95923 am: e5ee5111" into udc-dev-plus-aosp am: cf48bbe4 am: 730d49c0 am: bf25c904 -s ours

am skip reason: Merged-In I1900f2285ee3c3b1eb57d2cef3990896a64dae01 with SHA-1 8f74b2a1 is already in history

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



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