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