Merge "Fix UiBlcoker regression" into tm-dev am: 0f23863e am: 30fb5348 am: d3efd93d

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



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