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

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

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



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