Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
am: d1bac25518

Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6