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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie27a22273d1164908d3a4c0ba104af6576025a95