Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into...

Merge changes from topic "presubmit-am-940ae521a29b4031bfde43b5127edf9f" into tm-dev am: 770582d8 am: 18c63d99

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



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