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: I36510553a0e4de830f03f5dd597b2c30243cc400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>