Merge changes from topic "presubmit-am-b43ffe134bbc4d438135447b82cfeb07" into tm-mainline-prod am: a03b6154

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



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