DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 4a0d0a4fc8

Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13176161

Change-Id: Ic6d850340a6eed299215f8cf4774cb1277f87e1c