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

Change-Id: I424396abf3e403abd1eec8a529b0b322019b7a01