Merge changes from topic "sv2sec-sc-dev" into sc-mainline-prod am: 4bfbca30 am: 7d79abc5

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



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