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

vendor_snapshot/update.py

@@ -50,7 +50,7 @@ def get_variation(json_rel_path):
 # convert .bp prop dictionary to .bp prop string
 def gen_bp_prop(prop, ind):
     bp = ''
-    for key in prop:
+    for key in sorted(prop):
         val = prop[key]
 
         # Skip empty list or dict, rather than printing empty prop like