Merge "Reduce some redundant steps" into main am: 2458071b31

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

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