Merge "Flag for stylus education." into tm-qpr-dev am: bc907f45 am: 77a20096

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



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