Merge changes from topic "presubmit-am-c27d278e0e0841f2885908c9fdb81c7a" into...

Merge changes from topic "presubmit-am-c27d278e0e0841f2885908c9fdb81c7a" into tm-mainline-prod am: c18ad6ad

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



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