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

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



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