Merge changes from topic "hidl-system-api"
am: 88a2b68252

Change-Id: I862274d2d6a258f252370a9ae3843a31c038d684