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

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

Change-Id: Ia267e1e97c23094e0ecbe64b66c31f98bdf62f14