Merge "Fix OWNERS file for IBackupAgent.aidl" am: 268ecb069d am: d9d3ff4145

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

Change-Id: I31bb4e4944c097429feb9b158a3ef234a28a9810
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>