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

Change-Id: Ib0b5affb287771dfc965ebe0a05791849aa919c8