[automerger skipped] Merge "Move sensitive field parceling bool to...
[automerger skipped] Merge "Move sensitive field parceling bool to constructor" into rvc-dev am: 32396008 -s ours am: 2e1a4627 -s ours
am skip reason: Change-Id I588a40cd32667aba8e11c663833621b1c441a87a with SHA-1 7054de53 is in history
Change-Id: I965c16e394a11e00c8e3f33570c37570ae5fb677