Merge "Force consuming system bars if nav bar is shown forcibly" into udc-dev am: 495953ea am: 608406db

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



Change-Id: I1b8c1d5352739694c276c4f2bf4561982dd98b7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>