Merge "Add UI metrics logging for battery tips card." into udc-qpr-dev am: 40fa6ebb

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24484970



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