Merge "[automerger skipped] Allow persist.camera* as a valid prefix for vendor/odm sysprops am: bd61cfa79f -s ours am: 5e07e0e71f -s ours am skip reason: change_id I83fc6dc113c97a4875efd8fe608dd2f5f9592f15 with SHA1 4904f3f581 is in history" into qt-qpr1-dev-plus-aosp