Merge "Unexpose unnecessary SysUI APIs" into rvc-dev am: 60a6e43a am: d9351389 am: 663b6896 am: 0d2db4df Change-Id: Ie6c679347609bbe7a5c2a79891eb06ace828545a