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

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

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