Merge changes from topic "am-6918759643aa4a8c8dc627e3157a1624" into...

Merge changes from topic "am-6918759643aa4a8c8dc627e3157a1624" into tm-qpr-dev-plus-aosp am: e9c5dbee -s ours

am skip reason: Merged-In If1da19a3dd8c29542afc970b4b201d87547c27a9 with SHA-1 753331b3 is already in history

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



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