Merge "update javadoc for Settings.Secure.ANDROID_ID"