Merge "Simulate extra navigation bar for fixed rotation" into sc-v2-dev am: b4fabe9b

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

Change-Id: If4966c046b6e1af5753a7b0cab6b233ad9fc5f99