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

Change-Id: Idc4627e52ab370d1b5f5b5ec2bd6071ab0296e54