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

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

Change-Id: Iab7639f9aabcabef6afb02e108d00f5ad555174a