Merge changes from topic "sbHeight" into sc-v2-dev-plus-aosp

* changes:
  [automerge] [DO NOT MERGE] Update to use new res status bar height dimen 2p: 47fb15fe8c
  [DO NOT MERGE] Update to use new res status bar height dimen