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

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

Change-Id: I2e6e50e477c065443688d39b2024c8efd047818d