Merge changes from topic "am-6b15894ce759416592ccbafc3c571895" into...

Merge changes from topic "am-6b15894ce759416592ccbafc3c571895" into tm-d1-dev-plus-aosp am: b976d320

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



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