Merge changes from topic "am-4aa91c5e487f49d48ff3c19e39689ce5" into...

Merge changes from topic "am-4aa91c5e487f49d48ff3c19e39689ce5" into tm-qpr-dev-plus-aosp am: 7946fbf3

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



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