Merge "Remove never-reached 'return' statements" am: 2a91bd7331

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1959367

Change-Id: If5b83c5c70f79d0a32cfa4f347471153678aa116