Merge "Update our hardcoded measurements" am: 81e2528649

Original change: https://android-review.googlesource.com/c/device/generic/goldfish/+/1402758

Change-Id: I4fed9c700415ad32694c5bf30b8cd91e80faecfe