Merge changes from topics "presubmit-am-3c3afa1d2a32426e9cc02b94cf882542",...

Merge changes from topics "presubmit-am-3c3afa1d2a32426e9cc02b94cf882542", "presubmit-am-6f994c13a42546078af5336c840bf97f" into tm-dev am: 8de0fc5b am: 92e172a3

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

Change-Id: I0acf45b4569fa86601faf7d70854b18db9ca455c