Merge "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property" am: 83c78a2bb1

Change-Id: Icfcf0222bd97d52d6fed2eeef3c3fca335d8b93e