Merge changes from topic "presubmit-am-24469baaaea546dbbf9bbf95e81771ff" into tm-dev am: 2dff7839

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



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