[automerger skipped] Merge tm-dev-plus-aosp-without-vendor@8763363 am: 13009fe1e3 -s ours am: fafd4a6d67 -s ours

am skip reason: Merged-In I926d520cec73ac54f4c9da75d9dcc67f2edc7db1 with SHA-1 e862bdd306 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/device/sample/+/19094403

Change-Id: Ieb57733149cc4eac00c595acf2b083f32f2234e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>