Merge changes from topic "presubmit-am-40b0980fe2a34ebf8200f86b6c567e66" into...

Merge changes from topic "presubmit-am-40b0980fe2a34ebf8200f86b6c567e66" into tm-mainline-prod am: 96c27fb6

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



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