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

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



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