Merge "Include 'name' in props; use post-sanitize module name." am: 7f81f5473b am: 5c54fd6dab am: 6df5847c53 am: 468b01a123

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

Change-Id: I1e0117b2409af2ebb91b605cd2e54539de7cb6ea