Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into...

Merge changes from topic "presubmit-am-68408850f2c84138b668069c6e3a2e5a" into tm-mainline-prod am: 6520f173

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



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