[automerger skipped] Merge "Restore preserving mutability over parceling" into...

[automerger skipped] Merge "Restore preserving mutability over parceling" into rvc-dev am: ac774e33 am: a3263bb7 am: d8a4b707 am: b6143d7e -s ours

am skip reason: Change-Id I133047acfccae7af81199098caaf20ea8d641a89 with SHA-1 6a93b4fc is in history

Change-Id: Ide9c912c015292a69931e54650b6c622f837b953