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