Merge "Allow status_bar_height to be RRO controlled" into oc-mr1-dev
am: 45e8fe20de

Change-Id: Ic47deee56fc209b0230eab0358ff426f765735b3