[automerger skipped] Skip ab/6749736 in stage. am: 63bd46a79d -s ours am: f4b69e1ffe -s ours

am skip reason: Change-Id I86165be8b788aaa750d9a1d00d3188801d735bd6 with SHA-1 37708888fb is in history

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

Change-Id: I8e3aaa18d7bd7c69e8b16881e1fee556dd048bfe