Merge "Only auth via FP when device is locked, when Assistant is on top" into oc-mr1-dev
am: 990d25bda0

Change-Id: Iffeee7386623128a4228cb8efc1d6fe5af19e865