Merge "Fix a couple issues with nav bar & rotation button" into sc-dev am:...

Merge "Fix a couple issues with nav bar & rotation button" into sc-dev am: 49a841c0 am: 2ed5ad14 am: 68bddd06

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

Change-Id: I34879bbce0bbe5902db4f04f8b3f59599c41076c