Merge "No need to make non-empty judgment." into main am: b225077fbb

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

Change-Id: I929a3a905c579ae5d1cca18765b4832c37c7a25d
Signed-off-by: Automerger Merge Worker <[email protected]>