Merge changes from topic "presubmit-am-589bb396d75b41b3b75c505833d386dd" into tm-qpr-dev-plus-aosp am: 6d6eadb4 am: 6fb036fe am: 1e02f080

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



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