Merge "Backup platform: Update OWNERS." am: 0be136593e am: 04af92eeba

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

Change-Id: I785a8988c233d9963460ace4c51d0111e70d4f3a