am 5520610c: Merge "Make adb shell am display-size persistent." into honeycomb-mr2

* commit '5520610cb2612054c5d0bcec9d031f7b71faa349':
  Make adb shell am display-size persistent.