Merge changes from topic "am-14fdde8e45c44bc8aa7d94ffcc435b82" into...

Merge changes from topic "am-14fdde8e45c44bc8aa7d94ffcc435b82" into tm-d1-dev-plus-aosp am: 5b41d85e am: 0a87602b

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



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