Merge changes from topic "presubmit-am-bf36cb401ed14aafb716e5504efb04db" into tm-dev am: c9bb8bb4

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



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