Merge changes from topics "presubmit-am-1dec1aa04236490e8d2a03998a4272b7",...

Merge changes from topics "presubmit-am-1dec1aa04236490e8d2a03998a4272b7", "sdk-sandbox-instr" into tm-dev am: 3b5de448

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

Change-Id: I9b6ac48f1fdfb08305f4afcf2ef8bceb164eef0d