Merge "Don't force double-tap education on unfold" into tm-qpr-dev am: 8d71de9f am: a6a2209a

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



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