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 am: 7c4a0a77

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



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