Merge "[automerger skipped] Merge "Set maximum attribute value to defined by...
Merge "[automerger skipped] Merge "Set maximum attribute value to defined by spec Core 5.3" am: 0976a358 am: 11582b96 -s ours am: 391ba644 -s ours" into tm-d1-dev-plus-aosp