Merge "Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52" into oc-dr1-dev-plus-aosp
am: 30cf9cb2b3

Change-Id: I9548ebf370a868a18ceb4f91c8b581fc8f3df0fa