Merge "Move myself to the emeritus section" am: 9119105da9 am: 27a27acb2c

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1697923

Change-Id: I8aa67688d4c88a64c549e1094f3311ec4a4b2499