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

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

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