Merge "Reduce flickers of Injection" into tm-dev am: 6d9b155b20 am: ccf066c663 am: bcf6dd1384 am: eef51aaf8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18186097 Change-Id: I3fbfc9f529d4433e8144d9c6f3df77296f4d4596 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: