Merge "Support cuttlefish with an emulated 2GB SD" am: 7c5f3fe0 am: ddcba286 am: f4e6cdf9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8921e6a7c9f855bf9a1f7d5c6ea5c3eb2218bfea