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

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



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