Merge "Eliminate the injection flicker while navigating back" into udc-dev am: bfd3c051be
am: 3525c25d85
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659505 Change-Id: Iaec04625fdae44ca8068b7937bdc56bfc8c28b12 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: