[automerger skipped] Merge "Merge Android R" am: 0300106de7 -s ours

am skip reason: Change-Id Ice094d0d4aa2c303e26b43ab14dbf38bb0985be4 with SHA-1 f2b2b0a36e is in history

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1422292

Change-Id: Ie89e2032e6aec2fe579edd47684b7b102a04547d