Merge changes from topic "am-9e57427fe8294c8cb5fe5519156d3843" into...

Merge changes from topic "am-9e57427fe8294c8cb5fe5519156d3843" into tm-qpr-dev-plus-aosp am: c861151f

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



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