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

Change-Id: If0f557f4bfae932b5a061cb7ea855797cf8b32f9