Merge "Fix random systemui crashes during cts test DO NOT MERGE"