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

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

Change-Id: If7854bb03db1b001bb6dfd35f28f074a66b77abe