Merge changes from topics "presubmit-am-75f37079dffc432aa517bc8e4eb8269b",...

Merge changes from topics "presubmit-am-75f37079dffc432aa517bc8e4eb8269b", "presubmit-am-b883696932b4444b93bf6cb6589993f3" into tm-dev am: edd81e4e am: 1686dca9

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

Change-Id: I8ca922d507a0b08a96d96fe45cf5db01d35535ea