Merge changes from topics "presubmit-am-6d6a4b4f29394bb498818c2f4488d08d", "presubmit-am-b0e37416e8c743989854206f0e1f2acb" into tm-dev am: 6fbd9e77 am: 5e5fbb90

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

Change-Id: I1f94662253d1243d1a21e2d96079020fae82dcc6