Merge changes from topics "presubmit-am-5e82b57d626c41308e1301904b87a9f4",...

Merge changes from topics "presubmit-am-5e82b57d626c41308e1301904b87a9f4", "presubmit-am-bf1f6ea5e8904183a244a4f4fcdf02bf" into tm-dev am: 12af01de

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

Change-Id: Ib4e8c988240dede77c370a164ffcd5bb58fa13b9