Merge changes from topic "b221419865" into tm-dev am: 4682c657

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



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