Merge "Fix the injection disappearance in the Account detail page" into...

Merge "Fix the injection disappearance in the Account detail page" into tm-qpr-dev am: da288939 am: f9baa407

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



Change-Id: I5593f67b9fcc0e2168dbaf8abf4b64447debc093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>