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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c37cd402b0ebc436ff393127fe5a8a0e06961ef