Merge "Small Fix to App Usage logging" into rvc-dev am: c934b468 am: 1e634d7c am: efc8254e

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

Change-Id: I0c76a881f581216f21f040358590b24d9eb05a47