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

Change-Id: Ic2a1fae0c666be2ea5b7c50440172e203c1ddb61