Merge changes from topic "presubmit-am-87107c31c2ea4d7eae0e1ff6014ad1d9" into tm-mainline-prod am: 48d7c1f1

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



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