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

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



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