Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" into rvc-dev am: 4e1e7ef09a

Change-Id: I6c88e5725a1e8ed3300bfeda5bed26b0c8875e72