Merge changes from topic "am-798900a937674e2bac00c7302bca7f11" into tm-d1-dev am: 86ee66a3

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



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