Merge "Drop String::empty()" into main am: 47fc3df9a0 am: 68c2432f77

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2707114

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