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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iba16feeff3ea7e316bf2426a05820f6ddc3c9f28