Merge "[conflict] Merge "Use current user Context to generate NavBar layout" into tm-dev am: a7abdb12 am: 1a134955 am: 2606f247" into tm-qpr-dev-plus-aosp am: 233f8e74

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



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