Merge "Remove stopship workaround for instant app targetSdkVersion" into oc-dev am: 4a0ea3e88f am: 6d1b84bc3f
am: 8a691a3b2e

Change-Id: I03a5aa46d4ae74088d4ffe0eee32c239d044b628