Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into...

Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into tm-dev am: 770582d8 am: db0c3415 am: 537fb9d8

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



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