Merge "Guard one more use of CentralSurfaces in NavBar" into tm-qpr-dev am: fee4f537

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



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