[automerger skipped] Merge "Convert sysui to bp" into pi-dev-plus-aosp
am: 1b49835632  -s ours

Change-Id: I6e497f22eea641e5c2be55509e17fe9b17d35b78