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

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

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



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