[automerger skipped] Merge "Workaround for Recent app icon disappear" into rvc-dev am: 52707fce4f am: dae8a5bff1 am: 037eb6b776 am: 6fca027244 -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: Iccc2e96c1c328a65b81f3c64d50bed62d3da41dc
This commit is contained in: