Merge changes from topic "merge_8391262" into stage-aosp-master am: be28e531

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



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

core/java/com/android/internal/util/OWNERS

@@ -4,8 +4,4 @@ per-file *Notification* = file:/services/core/java/com/android/server/notificati
 per-file *ContrastColor* = file:/services/core/java/com/android/server/notification/OWNERS
 per-file Protocol* = etancohen@google.com, lorenzo@google.com
 per-file State* = jchalard@google.com, lorenzo@google.com, satk@google.com
-<<<<<<< TARGET BRANCH (83dd0c Merge "(ImsService API changes for Better IMS Threading) Ims)
-per-file DataClass* = eugenesusla@google.com
-=======
 per-file *Dump* = file:/core/java/com/android/internal/util/dump/OWNERS
->>>>>>> SOURCE BRANCH (2727d1 Merge "Adds OWNERS to com.androd.internal.util.Dump*" am: 0b)