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

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

Change-Id: I902d0f722d7e0b9578c0a29b0ca79dfa102d95d6