Merge changes from topic "presubmit-am-f6a40d8445d84e998849e35ec877030d" into...

Merge changes from topic "presubmit-am-f6a40d8445d84e998849e35ec877030d" into tm-mainline-prod am: 52f0b95b

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



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