This reverts commit 2dc804be11. It also removes the related calls from UiModeManager. Fixes: 32721178 Test: make & flash Change-Id: Id371bccec611155cc6910e46b3277c3d27fc1c79
2dc804be11
58ba53bd53
0889a8a070