Merge changes from topic "presubmit-am-f8f92274f63941ba977d234b0bb20d91" into tm-dev am: 582ba933 am: 1fb01b8c

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

Change-Id: I8d16bf7b0e0ce9210717201789df0ca72837070d
Signed-off-by: Automerger Merge Worker