Merge "Adding notification team members to notification directory" am: f290b00125 am: 1d7e8ae790

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1600634

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I32c192b2d4dfe390243a477b51ff807dced229fb