Merge "Handle STOPPED to PAUSED Usage events" into sc-dev am: 80bd76c77a

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

Change-Id: I67a56cded5421384f5abb83f9f50825a7c58ff32