Merge "Updating StatusBar people avatar sources" into rvc-dev am: e62f9e767b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11819189

Change-Id: I99c767b052a422cfec3963ac0f752b134edaec5b