Merge "Add auto option to device size" am: 829223135b

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1659941

Change-Id: I323cf08f360f0e13edb87f612eb8213fe62d92bb