Merge "Merge "Hide album art when face bypass" into qt-r1-dev am: c306592ff4" into qt-r1-dev-plus-aosp