Merge "Merge "Fix overlap between notifications and lock icon in portrait shade" into udc-dev am: 674a19a2 am: 12b2a2c7 am: 376518d0" into udc-qpr-dev-plus-aosp