Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into...

Merge changes from topic "am-828d7b02241a4b7fb76fe599192cd666" into tm-d1-dev-plus-aosp am: 3fc2589f

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



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