Merge changes from topics "presubmit-am-21467bac639546abb87776fa53a3459a",...

Merge changes from topics "presubmit-am-21467bac639546abb87776fa53a3459a", "presubmit-am-91ee056e41174db39dd02eabfb9e3eac" into tm-dev am: 4ef511ba

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



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