Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051

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



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