[automerger skipped] Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: a3d0c3f78a -s ours am: 6e4cdd28cf -s ours

am skip reason: Merged-In I43ad6f72d8592c973f1d72328baea175100c6201 with SHA-1 a4954c17a8 is already in history

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

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