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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idbc041c49cdf11a7696a9fc653cb202dd530b30e