Merge "Updating interface name to avoid AS build errors due to name conflict with SysUI"