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

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

Change-Id: I41bcbbc966570eb53feb276ff89a65b9854d92c3