[automerger skipped] Reduce the flickering of injected items when package is...

[automerger skipped] Reduce the flickering of injected items when package is changed am: e4b2b774 am: fe66e878 am: 3e5ce2c8 -s ours

am skip reason: Change-Id I77745b60f84510554bff1870a5bb7a8013eab528 with SHA-1 20df25e6 is in history

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

Change-Id: I2086b8de2ef85d5398ea6e4f7fa5b67fa85cddf0