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: c7f903c7" into nyc-mr1-dev-plus-aosp
am: 8eb9709e
* commit '8eb9709e':
Move both CE/DE storage areas to adopted storage.
Change-Id: I480b3b9c8f82f5721f868eaa81699a7e20ab9f38