Merge "Update Android ID (SSAID) to exclude package name in generation." into oc-dev am: 3492ed4376
am: d88c71a6e2

Change-Id: Ic6204047cd677b339ff3de0ba74e6b194086ea11