[automerger skipped] Merge "Merge Android R" am: ddb9444be0 -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: I982ea524e06a3fa8f02850f9e6b5ddf465729d81