Merge changes from topic "am-db90d31b263c4634abaa665ae875b8f1" into...

Merge changes from topic "am-db90d31b263c4634abaa665ae875b8f1" into tm-qpr-dev-plus-aosp am: 633ed2a2 -s ours

am skip reason: Merged-In I80fabf3a64c55837db98ff316e7e5420129c001b with SHA-1 cf62c760 is already in history

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



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