Merge changes from topic "am-c7afca18939e4f63ba7f87bee5964c1b" into tm-qpr-dev-plus-aosp am: a18e6872

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



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