Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522",...

Merge changes from topics "presubmit-am-7ed5c317d7b347f1a59eb332f20e8522", "presubmit-am-86ce18b053454a4db98a349f8b39985e", "presubmit-am-94d3142a4e1c418fadfd6eca6208920a", "presubmit-am-a466ed1382304d549cb550a5cae804e6" into tm-dev am: a62f3275 am: be288b8f

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



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