DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 62cb684c8e

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

Change-Id: I6bd8f7fd537163edc0226a9abcfccc1fd964123c