[conflict] Merge "No need to make non-empty judgment." into main am: b225077f am: c981530a

Flag: EXEMPT merge

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



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