Merge changes from topic "am-0ed08256e6f44b35bbcf3098e70eeea8" into...

Merge changes from topic "am-0ed08256e6f44b35bbcf3098e70eeea8" into tm-d1-dev-plus-aosp am: c7465bfd am: 6cb4adbb

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



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