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

Change-Id: If4ba8d279d1bafbcb606f703a0f7498954c73e62