Merge "Revert "Add falsing to undo button"" into tm-qpr-dev am: e419fb39

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



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