Merge "Force consuming system bars if nav bar is shown forcibly" into udc-dev...

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

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



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