[automerger skipped] Merge "Camera: Add the property to raise the thermal severity to moderate for CPU throttling." into tm-qpr-dev am: 590e16b121
am: f9aba0b317
am: 6f48a634a5
am: 5a452f55fa
-s ours
am skip reason: Merged-In Iad53f94f55c8cd4998339fb8e1103dd9d1a9fc90 with SHA-1 e6c84ed36e
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/device/google/felix/+/21987931
Change-Id: I55559e6df052e1fbdd95a76a74e1377fab8a3670
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
commit
32bb34f372