Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev...

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

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

Change-Id: I5fa97bb1a3feac16a64fd74696aa6713b8aeb2aa