Merge "Remove mrenouf from Shell/OWNERS" am: febaec9f3e am: b58226efcd am: b570fbc30f am: 42a13dba3f

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

Change-Id: I9affcd032844a7a85dec9d07b1373d12cfde0c3b