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

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

Change-Id: I4b4a4ed33882c752484bdbbda7ac8b8f68272501