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

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

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



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