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