Merge "Use current user Context to generate NavBar layout" into tm-dev am: a7abdb12 am: 6fb97848 am: 17676f8b

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



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