Merge changes from topics "presubmit-am-10eb3d835eca4319b6144c8f4c068e9c",...

Merge changes from topics "presubmit-am-10eb3d835eca4319b6144c8f4c068e9c", "presubmit-am-4b02653e83b548f494f92f7a023c91b9" into tm-dev am: 8459b0ce

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



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