Merge changes from topic "presubmit-am-58a631437ba649c5a21ac129b7b6e719" into...

Merge changes from topic "presubmit-am-58a631437ba649c5a21ac129b7b6e719" into tm-qpr-dev-plus-aosp am: d7359e64 am: 45d37047

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



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