Merge "Add falsing to undo button" into tm-qpr-dev am: 0c296801f4 am: 48c6116eef

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

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