Merge "Check calling user id against current user before setting navbar mode." into tm-qpr-dev am: 021e2eaee0 am: f1945e7dc7

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

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