Merge "Fix include of owners that was pointing to itself, and not loading the...

Merge "Fix include of owners that was pointing to itself, and not loading the expected owners that were desired in ag/13414459" into sc-dev am: 270ff01e am: 1a882262

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I99c00ddbeba85a9cad5700e34602faad0df8ef1b