Merge changes from topic "register_future_dismissal" into tm-dev am: 38a97b78 am: 1f828de0 am: 07a443a6

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



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