DO NOT MERGE - Merge RQ1A.201205.011 am: 8aee36b0c2

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

Change-Id: I5a007b669ac8a3e953bc6e32aa71a643067bb202