Merge "Adding flag for keyboard education flow" into udc-dev am: 6218576e am: 1bb7bf21

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



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