Merge "Increase size of userdata to 256MB" am: fabde79e3e am: 9ed0889129

Original change: https://android-review.googlesource.com/c/device/generic/trusty/+/1996170

Change-Id: Idf095919084bada4831ce9f1155a6e03169f22d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>