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

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



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