Merge "Minor optimize code for performance" into main am: 3f1c871a01

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

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