Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into...

Merge changes from topic "am-22097985f3b54fc3b130440b4d974f8b" into tm-qpr-dev-plus-aosp am: 17603488

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



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