Merge "Merge "Set background drawable on status_bar_container" into rvc-dev am: 69994da6 am: 170a3ecb am: 515a01ca" into rvc-qpr-dev-plus-aosp