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

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



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