Merge changes Iac1c21ce,I2329432a

* changes:
  Add relevant SysUI values to notch emulation packages
  Move QS height values to frameworks/base/core/res/