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

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



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