Merge "Merge "Updating StatusBar people avatar sources" into rvc-dev am: e62f9e767b am: dff1ac98e5 am: 8a60d37d9c" into rvc-qpr-dev-plus-aosp