Merge changes from topic "sv2sec-sc-dev" into sc-qpr1-dev am: 9c59526a

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



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