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

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

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



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