[conflict] Merge "Use current user Context to generate NavBar layout" into...

[conflict] Merge "Use current user Context to generate NavBar layout" into tm-dev am: a7abdb12 am: 1a134955

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



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