Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into tm-dev am: 770582d8

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



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