Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]"...

Merge "[conflict] Merge "Migrate from android::String isEmpty to empty [aapt]" into main am: 2ce95923 am: e5ee5111" into udc-dev-plus-aosp am: cf48bbe4

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



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