Merge "Add mady to Shell/OWNERS" am: 708e1e5995 am: 8ee7052466 am: 8365756bc7

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

Change-Id: I0fef5818e1b758d9b80dc3107f1bc3d0bc22026d