Merge changes from topic "presubmit-am-0141ebd6919d4431b91f43ddd2fbf1d8" into...

Merge changes from topic "presubmit-am-0141ebd6919d4431b91f43ddd2fbf1d8" into tm-mainline-prod am: feb07a69

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



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