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

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



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