Merge "Fix duplicate display update upon nav mode change" into tm-qpr-dev am: fad6eccb

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



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