Merge changes from topics "breakdown-usage-by-uid",...

Merge changes from topics "breakdown-usage-by-uid", "notify-device-interaction" into udc-qpr-dev am: e632c7cb

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



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