Merge "Adding alexflo@'s team" am: 5bfe18ca55 am: cdaf2613cf am: 38caa9f305 am: bad23fe8f7

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

Change-Id: Icf3c0bea70b3468edb6bec2b82a80bb078331cc4