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

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



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