Merge changes from topics "drop-4.19-t", "drop-5.4-t" am: 738dd1a9e3 am: a43ab5356b am: a873ab2d96 am: f696907318

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

Change-Id: I255139a5984b7887b48333a474d32d5d63e81356