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