Merge "Merge "Merge "Docs-change: clarification of LauncherApps.getApplicationInfo()" into oc-dev am: d726ff98 am: 84a4d3de" into oc-dr1-dev-plus-aosp am: 9dd37a48"