Merge changes from topic "am-92a10bb61c25454cb97bca40d2487b12" into...

Merge changes from topic "am-92a10bb61c25454cb97bca40d2487b12" into tm-d1-dev-plus-aosp am: 342eb6b7 am: dcde4b82

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



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