Merge changes from topic "am-37170c8f22554766afc25915c7a99d41" into...

Merge changes from topic "am-37170c8f22554766afc25915c7a99d41" into tm-qpr-dev-plus-aosp am: 12c59c3f

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



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