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

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

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