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

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

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



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