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

Change-Id: Ibac40f343ff91c3898ebf362140b8aca07a6eaff