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

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

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