Merge "Merge "Move both CE/DE storage areas to adopted storage." into nyc-dev am: cdea85e9a3 am: c9994771fb" into nyc-mr1-dev-plus-aosp