Merge "Migrate from android::String isEmpty to empty" into udc-dev-plus-aosp am: 07fd56cc13 am: b8b8fe01b6

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

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