Merge changes from topic "sdm-install" into main am: d26ba0f392

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

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