Merge "Don't assume device has on screen nav bar in RoundedCorners service." into oc-dr1-dev
am: d20db5a0bd

Change-Id: Idf9600ba1aa8de0a43f146425afdc9485391c12d