Merge changes from topic "presubmit-am-2e9b3f098cb846d1a73d05415bb16c27" into...

Merge changes from topic "presubmit-am-2e9b3f098cb846d1a73d05415bb16c27" into tm-mainline-prod am: 705bbbdb

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



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