[automerger skipped] Merge changes from topic "fakevaluegeneratortest" into...

[automerger skipped] Merge changes from topic "fakevaluegeneratortest" into tm-dev am: 27358316 -s ours

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

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

Change-Id: Ibcda4659b0429648eed1b50191bfae4a1b6e3120