Merge "Revert "Restrict {AM,WM}.closeSystemDialogs()""