Merge changes from topic "b224749799" into tm-dev am: 123c1b0954 am: 7325f79b04

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

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