Merge "Unexpose unnecessary SysUI APIs" into rvc-dev am: 60a6e43a74

Change-Id: Ieafa71b0b9261cc532c812209154b75a99ee9890