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

Change-Id: I77051a94b2e8694d378973c79310befca933515b