Merge "Merge "Add dump of current nav bar layout" into rvc-dev am: 3b3093b7...

Merge "Merge "Add dump of current nav bar layout" into rvc-dev am: 3b3093b7 am: a822ebe7 am: f0731cc8" into rvc-qpr-dev-plus-aosp am: 60d0f7e4

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

Change-Id: I499929d84382fd5673bdc231d755ba212b351e05