* commit '25d81a4c613a30f55217036dfba92a3c895f8d88': Revert "Re-@hide activity-level FLAG_IMMERSIVE and helpers."