Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into...

Merge "UidObserver / Camera: Track the OOM adj of a uid via UidObserver." into udc-dev am: 3b666b0b am: ff7a3671 am: b6a770e1

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



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