[automerger skipped] Merge "Move sensitive field parceling bool to...
[automerger skipped] Merge "Move sensitive field parceling bool to constructor" into rvc-dev am: c02d8ed6 -s ours
am skip reason: Change-Id Ib145ca7f36dcbee6ef47d09862a181fc04a28f03 with SHA-1 ad7ddfd7 is in history
Change-Id: I4d00f9a53ab0b129e3d9380f3381a29800cd2508