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

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



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