Merge changes from topic "presubmit-am-d21852bac5494ecd81a33e411c078e7e" into tm-dev am: 02d1b80c am: 1556fd92

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



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