Merge "Merge "Updating StatusBar people avatar sources" into rvc-dev am: e62f9e767b am: 8bdc02773a" into rvc-d1-dev-plus-aosp