Merge changes from topic "presubmit-am-4a2696f4ddc84cf0bbb8f7ad2cec421d" into tm-mainline-prod am: c36db9e7

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



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