Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc",...

Merge changes from topics "presubmit-am-e1ccffb4201944be9e638acb9f6f4dfc", "presubmit-am-e6236e948fb14688bc4afb3adb9e745b" into tm-dev am: dd2c72a6

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



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