[automerger skipped] Merge Android U (ab/10368041) am: 9a247936b5 -s ours am: ca41259dae -s ours am: 999df607fe -s ours am: 5c72511e8f -s ours

am skip reason: Merged-In I1c72e5ede24439b1471974bc32a9796a5e42878a with SHA-1 1242f7d4ee is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Stk/+/24181979

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