Merge changes from topic...

Merge changes from topic "presubmit-am-1ed947fca7094fbbac88b82e8b541160-tm-qpr-dev" into tm-qpr-dev am: 5f4eedfb

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



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