Merge changes from topic "presubmit-am-309bd698bce64ba688b2d3e351e12ef1" into tm-qpr-dev-plus-aosp am: 9617844c

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



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