[automerger skipped] DO NOT MERGE - Merge RQ1A.201205.011 am: 2324b78a22 am: e78a390aff -s ours

am skip reason: subject contains skip directive

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

Change-Id: I9275b71c1b0e35b7695b495a25990a01e6957954