Merge "Fix random systemui crashes during cts test DO NOT MERGE" am: d8514e82aa  -s ours am: e9940be86d
am: cb9ded1d30  -s ours

Change-Id: I879999d0033e242d02c50bf6ea4a2c40a433a871