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

Merge changes from topic "presubmit-am-8d46ef8e146342db89da2c1ff44742ea" into tm-dev am: c6de69d8 am: c21d8a97

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



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