[automerger skipped] Merge "Fix system UI break in some devices" am: 19788abedd am: 6add1afd83
am:1a76e63ac3-s ours am skip reason: change_id I08f77a6507edc076758d53f051fadd60fa6c8f9d with SHA18d8c3b7aadis in history Change-Id: I56307bf9a66873172e1137517559a38028276156
This commit is contained in: