Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388",...

Merge changes from topics "presubmit-am-8e1f6f3832184ab4980013d926d31388", "presubmit-am-a0b2814b27254513b7a62e0a1e0044ff" into tm-dev am: 6f06d92d am: ba43c8e0

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

Change-Id: Ibc1f6610bb0ee19db483ab05f1df3cc661b0e17d