Merge "Fix a couple issues with nav bar & rotation button" into sc-dev am: a44256ef am: 02943d34 am: 1654a919

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

Change-Id: I989c7889c012d9c8786cb189bbe1dea750a6fa1f