Merge changes from topic "presubmit-am-b07c53c40c7a488890bf5c1d4084ea9d" into tm-dev am: 9302d899

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

Change-Id: I79cb4593994c762ed83b627cc465d57e2f07bb23