[automerger skipped] Merge "Create People Space FeatureFlag" into sc-dev am:...

[automerger skipped] Merge "Create People Space FeatureFlag" into sc-dev am: 38735b0a am: dccff027 -s ours

am skip reason: Change-Id I2d8d9b22b8cff1404b24eb59b81863c6fb9e3964 with SHA-1 84566e12 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I31af7f18200d2e402c8a4ae0b5488a44b80d9d99