[automerger skipped] DO NOT MERGE Fix build break of systemui testcase
am: 09c9c7733b  -s ours

Change-Id: I50550d85f688cbf3b839aaa044423228064cfa2b