[automerger skipped] Merge changes from topic "fakevaluegeneratortest" into tm-dev am: 273583165c am: 14afc782d0 -s ours

am skip reason: Merged-In I65e87fa62b8538164fcdd60a9df871a9817f4f8e with SHA-1 d0e9111cad is already in history

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

Change-Id: Ib1fe483286ba896cd656f100296563e1f547385a