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

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

Change-Id: I719298206ca5f64122370bf32086bbf9b5dc17be