Merge changes from topic "presubmit-am-8d46ef8e146342db89da2c1ff44742ea" into...

Merge changes from topic "presubmit-am-8d46ef8e146342db89da2c1ff44742ea" into tm-dev am: c6de69d8 am: 201df351 am: c8cfdbe6 am: 0a3b341b

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



Change-Id: If8edee55604131dd6c7e8128828b75c28443dcde
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>