Merge changes from topic "presubmit-am-7ab576aad10743259b05a52548563d0c" into...

Merge changes from topic "presubmit-am-7ab576aad10743259b05a52548563d0c" into tm-mainline-prod am: 19af157c

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



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