Merge "Support switching navigation modes." into udc-qpr-dev am: 81392e3d am: 1bd87b8f

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



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