[automerger skipped] Merge "Remove hidden API usage:...
[automerger skipped] Merge "Remove hidden API usage: isFileEncryptedNativeOrEmulated" am: f50d3955 am: d8e4ae12
am: 9692052d -s ours
am skip reason: change_id I519c2d1065d4c117213ca93d355b941027d700b6 with SHA1 145f01a1 is in history
Change-Id: I69537b61bd2f9775362da41d85446a5372e5124c