Merge changes from topic "presubmit-am-006c5140b9fb42ccbea1fb7797306405" into tm-mainline-prod am: 2d4f6ed2

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



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