Merge "Re-run pinner service on camera app update and dex optimization." into oc-dev
am: a7e45e364c

Change-Id: Idd235d42904bb03ef38a1bb3972b9e82353bbaff