Merge changes from topic "presubmit-am-0dc44efdc89c4009b75e40a2ea6e9bc4" into...

Merge changes from topic "presubmit-am-0dc44efdc89c4009b75e40a2ea6e9bc4" into tm-mainline-prod am: 7c1dccf1

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



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