Merge changes from topic "presubmit-am-edb9e31c38704f8a922e0a1b4ba0055e" into...

Merge changes from topic "presubmit-am-edb9e31c38704f8a922e0a1b4ba0055e" into tm-mainline-prod am: e6137df5

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



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