Merge changes from topic "presubmit-am-5d0b5ec753a44b1cb74d9f24a3e843e8" into tm-dev am: 1b593cab

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



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