Merge "Pause is getting scheduled 2 times" am: d1c32f2c

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



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