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

Merge "Don't show user education if it's hiding" into udc-dev am: ebf2f440 am: cd241554 am: fd60cd89 am: 0e434028

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



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