Merge changes from topic "presubmit-am-bf36cb401ed14aafb716e5504efb04db" into...

Merge changes from topic "presubmit-am-bf36cb401ed14aafb716e5504efb04db" into tm-dev am: c9bb8bb4 am: 887d7f17 am: 76b9c4fa

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



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