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

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

Change-Id: I9f5e9b7191dbdfb8e6245a3c2efc4a581f78bb79