Merge "Add alanstokes@ to privileged permissions OWNERS" am: bb448f504f am: e5bf14e7aa

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0721a35678546bc37259893a1f5f903e75149e0b