Merge changes from topics "presubmit-am-383593e5942445eb8d161d1e83da2250",...

Merge changes from topics "presubmit-am-383593e5942445eb8d161d1e83da2250", "presubmit-am-d7f8eeae4f3640ce9f6884b186ad4fc4", "presubmit-am-de00cd8bc3af4ee0ba3508d2af5b09e2" into tm-dev am: 5876d9b6 am: 73404ab0

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

Change-Id: Ifcd81624cec34ccd91ff05af8bb005dcc8fbb1e0