Merge changes from topic "presubmit-am-c9cb075809db4cbaa9e01b7a933994b8" into tm-mainline-prod am: 5021c15b

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



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