Merge "Remove unnecessary entries in frameworks/base/config/OWNERS" am: a2baa71441 am: e9ec371853

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

Change-Id: Ib09776772c64f8205dad6c233bf030ab380707e5