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