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: a923300e am: 4e5d9a78 am: baaa1c4e

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



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