Merge changes from topic "am-f182dd0232d64c57b5a2bd653bdb591c" into tm-qpr-dev-plus-aosp am: 44f437d5

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



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