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

Merge changes from topic "presubmit-am-e682b1372da048a28f1df250604c00e0" into tm-mainline-prod am: cb56182c

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



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