Merge changes from topic "presubmit-am-85d24ca3e2624905a8fae68b1ad319bd" into tm-mainline-prod am: cb732712

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

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