Merge "Revert "Support immersive mode with task bar"" into sc-v2-dev am: 6cd63468

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15717476

Change-Id: If351f95681e22384c64cc9988624596266acbccd