Merge "Remove unnecessary entries in frameworks/base/config/OWNERS"