Merge "Remove unlock dialog from sysui" into rvc-dev am: 94fbff18e5

Change-Id: Icc6ca71733df978f95126cfaefbc7be07e27df49