Merge changes from topic "am-db969ff5788044d4aa0e06be7b473dea" into...

Merge changes from topic "am-db969ff5788044d4aa0e06be7b473dea" into tm-qpr-dev-plus-aosp am: e49bce03 -s ours

am skip reason: Merged-In Id6dfb4f4c48d5cf4e71f54bdb6d0d6eea527caf5 with SHA-1 2f2e7d84 is already in history

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



Change-Id: Ibc013963ee194dc288f75fa4f67c3970ac08488f
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>