Merge "Accessibility change when Trusted Face icon shows." into pi-dev am: 3e169cac13
am: 7335dc492e

Change-Id: Ice6f77fef237cfab5a2152c05563221983756abe