Merge "Fix DisplayDeviceConfig crash for values > 255" into sc-qpr1-dev am: 77785b6a72 am: 270f0f706e am: 103273eb83

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

Change-Id: I987a74315cd3c17d399a14785b0b5cdd9784c780