Merge "Sort properties to ease comparison." am: 3dc563e396

Original change: https://android-review.googlesource.com/c/platform/development/+/1611255

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6078c207807517dc3b1919f8adb60e5bd60d90f4