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

Merge "Pause is getting scheduled 2 times" am: d1c32f2c am: a7bdc3fd am: 573654ba am: e465b971 am: 59251fbe

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



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