Merge changes from topic "fakevaluegeneratortest" into tm-dev am: 27358316

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

Change-Id: Ia35d6c96ffbcb4663f25bc8685e45c5b4b178a20