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

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



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