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

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



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