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

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

Change-Id: I30ac44cef1f276b83d01355dd3107d2d12f70963