Merge "Don't show user education if it's hiding" into udc-dev am: ebf2f440 am: 7f35e8fd

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23320751



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