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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie68f8f19ca1713df4597b9e6e7bac6ad38dd401b