[automerger skipped] Merge changes from topic "hidl-system-api" am: 88a2b68252
am: 09d3aef926  -s ours

Change-Id: I0be4f97cf2df20d422f5fa8a4498f6f645d05e46