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

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



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