Android Mainline 10.0.0 Release 7 (6046485)
[automerger skipped] HalManifest xsd: fix attributes am: 775b8c3131 -s ours
am: cb30bb4b74 -s ours
am skip reason: change_id I637a587684b57b310e8d0a2c2875f1aee605a70c with SHA1 a5c0ccf668 is in history

Change-Id: I2d986e00b9d77bcc35c4dd30f1708784bfd9cc75