Merge "Remove never-reached 'return' statements" am: 2a91bd7331 am: 9dfd7f1589 am: 4dae354720 am: bc2d8a12b8

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

Change-Id: I043a1e25872d3ff9857dc5315f48652fffc847ae