[automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f
am: 4a4f006894
am: bf683c416e
am: 6229bf3e70
-s ours
am skip reason: Change-Id I7a78ba47a0383a5e4c65bd461a15a8425beb1acb with SHA-1 b4a5f16b2f
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862420
Change-Id: Ia7055e50c942e1aeefa0d67ee351c4b2638482e8
This commit is contained in: