[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: 4b3d851f am: 615e2493 -s ours

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

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

Change-Id: I27e371d678720285b90f0e3597ec2920a2f20d58