Merge "Fix test for a11y fingerprint with no sensor" into oc-dev
am: 81150a53c8

Change-Id: I21605c5b937c05d5a488247edf1a53ccf28a98f7