Merge "Merge "Updating StatusBar people avatar sources" into rvc-dev am: e62f9e76 am: 8bdc0277" into rvc-d1-dev-plus-aosp am: 12c1a307

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

Change-Id: Ifc13285246186a434b5f0a68db6a71c53ee26e75