Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into...

Merge changes from topic "presubmit-am-14c0d0dd1ab9408c8fbd89013e2295b5" into tm-mainline-prod am: 7fe7764e

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



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