Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev am:...

Merge changes from topic "am-c418ed2ce8084abd8ce2fcc75e7baf7e" into tm-dev am: f93b8f0e am: 596879bb

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



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