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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic0e156c24939baca97eb1923767e709f9166f2fc