Merge "Handle Activity Resume to Stop case for AppUsage logging" into rvc-qpr-dev am: 1c38963be0

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

Change-Id: I64541b44d167f241c54c0147b4a5a86feba76ba7