Merge "Remove clarabayarri from text OWNERS" am: 3fe6523d2f am: 153ae28af7

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

Change-Id: I36b8f7edad6cd11e54c89c8adcc43177710d8fac