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

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

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



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