Merge changes from topic "navigation-task-block" into tm-mainline-prod am: 84566206

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



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