Merge "Avoid using stale sessions for cleanup alarm." into sc-dev am:...

Merge "Avoid using stale sessions for cleanup alarm." into sc-dev am: cefde1b8 am: 111ab66f am: e760da8f

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

Change-Id: Ie8c831091d598cdeecdd36c8933de1d55ddf0681