DO NOT MERGE - Merge RQ1A.201205.011 am: 8836e88707

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

Change-Id: Id95387bb1b2cba4367b1136aabebec4654c123dd