Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into...

Merge changes from topic "presubmit-am-2a14cb00e8874c219118050b0a76316a" into tm-mainline-prod am: d63b7243

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



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