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

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



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