[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -s ours am: 46d255c5ee -s ours am: 79e6f36845 -s ours am: c1c1d6bf6c -s ours am: 48f1fed848 -s ours

am skip reason: Change-Id I3eacc623ecb0e0c2fb65633d5d6ab9df811c61dd with SHA-1 3f8d030a1f is in history

Original change: https://android-review.googlesource.com/c/platform/developers/samples/android/+/1422288

Change-Id: Ida40da640ec072962780e7dc1c732227b4f12314