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

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



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