Merge "Remove obsolete OWNER." am: c59205de2a am: 56dce3334b am: b12f537798

Original change: https://android-review.googlesource.com/c/platform/development/+/2042670

Change-Id: I029cd0cedde26e0cb1a1e677d61b24c006e5e1df
Signed-off-by: Automerger Merge Worker