Merge changes from topic "revert-1540633-DNRXHDZSUB" am: f504e514c4 am: 9727575946 am: 657097c29c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64bdaddf33e63f76ca1a23eb6e4c08a3cf22789e