Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe057

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1596331

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id09e94dbed97fcecd62f458a62cf60c0594e6a1d