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

Merge changes from topic "presubmit-am-fd70e1c6a633413aaa63fb8d8091e2b6" into tm-mainline-prod am: 7ecff6fd

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



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