Merge "Reset the layer of the nav bar when restoring it back" into sc-dev am: dfdfad1a

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

Change-Id: I18d03a96b745e4e49d24ce20d7e51148b72418dd