Merge changes from topic "am-3cca388a3caa4b26baf89777ec21a994" into...

Merge changes from topic "am-3cca388a3caa4b26baf89777ec21a994" into tm-qpr-dev-plus-aosp am: 224e264a am: f2ba1238

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



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