Merge "Fix clickjacking again for accessibility services" into oc-dev am: 7348c5c91b
am: 91df0c9a03  -s ours

Change-Id: I683f75c1b25b74d060c8ad0dc89063dc1f303eba