Merge "Fix b/265364507: Merge GPU and TPU into Others in battery usage system components list" into udc-dev am: 2959831d59
am: d99ae387d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21546834 Change-Id: I37dd3f4cbc493c169d0f81b96383f4f12cb0115d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: