Merge changes from topics "presubmit-am-121da4597331411b86c0a3f45eabcc4c",...

Merge changes from topics "presubmit-am-121da4597331411b86c0a3f45eabcc4c", "presubmit-am-85bb9a360df04e4fa2dd6536bf36fa36" into tm-dev am: e5d0c2d2

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



Change-Id: Ibce6223c46fb7e4f206ded717cbebb7ea35d39db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>