Merge "Add disable/enable camera service watchdog feature" into tm-qpr-dev am: 61a4ee1d

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



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