Merge changes from topic "am-0b23c036d5064a80904345516fd59fe6" into...

Merge changes from topic "am-0b23c036d5064a80904345516fd59fe6" into tm-qpr-dev-plus-aosp am: 77c0bad1

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



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