Merge changes from topic "am-7774e9d8539f40dcae2cdc41b5ff72a8" into tm-qpr-dev-plus-aosp am: fe50fe14 -s ours

am skip reason: Merged-In I2b8472659392b9e7c499bb816dd23e9470655af4 with SHA-1 5990b7f6 is already in history

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



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