Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into...

Merge changes from topic "am-7d13f9b473c743eaae369a3946da2a24" into tm-qpr-dev-plus-aosp am: 9ddcfb2b

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



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