Merge "Trust navbar panel and accessibility overlays" into oc-dr1-dev am: b5f0e91c4c
am: c89bac8f6e

Change-Id: Iefedb1d008614884b1bd3d0abd5bbb7d1b1788fe