Merge "Merge "Move both CE/DE storage areas to adopted storage." into nyc-dev...
Merge "Merge "Move both CE/DE storage areas to adopted storage." into nyc-dev am: cdea85e9 am: c9994771" into nyc-mr1-dev-plus-aosp
am: 724d809f
* commit '724d809f':
Change-Id: Iae3219a495aa8952bab708cac3783934448d5f28