Merge changes from topic "am-7311d712595b4c4f8740cade504051c3" into...

Merge changes from topic "am-7311d712595b4c4f8740cade504051c3" into tm-qpr-dev-plus-aosp am: 1c324243

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



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