Merge changes from topic "am-c2a9b70293144d2c8040c3b282ad79fc" into...

Merge changes from topic "am-c2a9b70293144d2c8040c3b282ad79fc" into tm-d1-dev-plus-aosp am: fee1c0aa

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



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