Merge changes from topic "presubmit-am-4f9fc19ffc9c438783716840b90748da" into...

Merge changes from topic "presubmit-am-4f9fc19ffc9c438783716840b90748da" into tm-mainline-prod am: 43dd80d9

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



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