Merge "Update the resources owner files" am: 70d5485b28 am: bbf64f041e am: 2512fc7380 am: 187863655c am: 2999ac25fb

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

Change-Id: Ib8678bba4656240da3298446d8c8b7359536d7ff