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

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



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