Merge "Update the navbar surface when the nav bar is detached" into udc-dev am: 05f4f569 am: 4b729d91

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



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