[automerger skipped] Allow persist.camera* as a valid prefix for vendor/odm sysprops am: bd61cfa79f
am: d30303955e -s ours
am skip reason: change_id I83fc6dc113c97a4875efd8fe608dd2f5f9592f15 with SHA1 4904f3f581 is in history

Change-Id: Ib3d1e4a238e79c56c5de0f58404dc73d32ca86b1