[automerger skipped] Mark ab/11976889 as merged in aosp-main-future am: 8471c36c91 -s ours

am skip reason: Merged-In Ic680b115fe72fce7fd512c6be647e5315c1f21ab with SHA-1 03f7fd590b is already in history

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

Change-Id: I56e1a5205ff3636f6deeebd88735e86909c33f8b
Signed-off-by: Automerger Merge Worker <[email protected]>