Promotion of android-framework.lnx.2.0-00009.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1060472   Ib867180d9e54a0a27211fc5037d0f20b8d91423d   cryptfs: fix issue that caused problems with forced HW e
1034358   Ife656f3d4e8344522691ed1897a38a4da1540cbc   cryptfs: Fix double counting of decryption failure

Change-Id: Ib6eb9c594b64297c70cbf5c3a5ea3efe32be8434
CRs-Fixed: 1034358, 1060472