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

Change-Id: I49015844829d55a903437a807b345688794002b5