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

Change-Id: I7d27e65dd6f5e0944bb8a0d4d06308ed821b66ae