Merge "Drop String::empty()" into main am: 47fc3df9 am: 68c2432f am:...

Merge "Drop String::empty()" into main am: 47fc3df9 am: 68c2432f am: 17379e43 am: b23651d7 am: 8a48459f

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



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