[automerger skipped] Merge changes from topics...

[automerger skipped] Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev am: dd2c72a6 am: 4601c17f am: e8075590 -s ours am: 96a314b4 -s ours

am skip reason: Merged-In I578fd1aba9335e2e078d749321e55a6d05299f3b with SHA-1 d4fd3a11 is already in history

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



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