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: 6d20606e am: 631f5aa1 am: 15a6c137

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



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