Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp am: 22c713ee am:...

Merge changes from topic "sv2sec" into sc-v2-dev-plus-aosp am: 22c713ee am: 29e2d39c am: 203ba229

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



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