Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev am: 28b05910d8

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

Change-Id: I9bbb023a738a2d58e178b8dc78e19a5d70a28feb