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