Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into...

Merge changes from topic "cve-fp-sc-v2-dev-sc-qpr1-dev-sc-dev" into sc-mainline-prod am: 110c9b4c am: 7f4a849c

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



Change-Id: I2b15bad4d496d9c10da0f3bf74461a111d5b7b71
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>