Bug: 205828770 Test: m SystemUI-core Change-Id: I80194b9959b9be3b87d2f074557f4e79f164ceca (cherry picked from commit 11ae0987)