Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b

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

Change-Id: I23789ff1fa3119dd7bd70bac7439409ea72fbc2f