Merge changes Id7d1ff26,Id53a2e65 into rvc-dev

* changes:
  Add am compat enable/disable/reset test for not installed app
  Gate stricter manifest enforcement on targetSdk R