Merge "Merge "Fixed an accessibility issue with the pin view" into oc-dev am: 06fdcf8a40 am: 656c1105f6" into oc-dr1-dev-plus-aosp
am: 0ee8c0357a

Change-Id: I28ab82aa34e3e401748c1ce9874c394c0fc75633