Merge "Move myself to emeritus section" am: c8fd9b844b am: b4a032843b

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

Change-Id: Ie735d8b711a7e852c010398f5ea2f9ce00ead32b