Merge changes from topic "sv2sec-sc-dev" into sc-mainline-prod am: 4bfbca30eb am: 7d79abc5b0 am: 233c70618b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567806 Change-Id: Idb567279d94d2addaa6cbad6a30f6c8483d9c393 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: