Merge "Update Assistant entry points on navigation mode change" into sc-v2-dev am: 4d6947e323

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

Change-Id: I25cf4d09378cd8d3c661934fb07c8e7cbb37af6f