Merge "[automerger skipped] Merge "Added systemui controller to control system bars." into android11-tests-dev am: e5e9acc7a5 -s ours" into android12-tests-dev