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

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



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