tree 4a426792cd898eae50feda596ee7c1e277db3296
parent 6c7a166d9e074c3bbef505cd15e4a40e387bc56c
parent fad30e4c7b6b42cc9c918e97eb500ec78264de6b
author Connor O'Brien <connoro@google.com> 1614586634 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1614586634 +0000

Merge "Revert "Revert "Clear BPF data in KernelCpuUidTimeReader.removeUid()""" am: a0bbd188e4 am: 9267c31a1c am: fad30e4c7b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I47f3e39fa42b7eb377f829bd4c1e255cd0f676cb