Merge changes from topic "presubmit-am-1678afb0699249a5a6a8765289b78ae3" into...

Merge changes from topic "presubmit-am-1678afb0699249a5a6a8765289b78ae3" into tm-mainline-prod am: 2b7317d6

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



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