Merge changes from topic "refbase-lar" into main am: ea332b76 am: 7bc5c6be

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3474558



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