Merge "Adding Natanieljr@ to flicker owners" am: 51fa9312f4 am: 36a33d2e04 am: 1d746f6ece

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I589c75fe2032fb010e2df53fcf2c30a7341fb6b4