Merge changes from topic "presubmit-am-59a480c9f2b640759c6bbe002266b875" into tm-dev am: f050a9b0

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



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