Merge "Relax Instant Apps Settings whitelist enforcement" into oc-mr1-dev
am: 7ebe5f0ba1

Change-Id: I39d11196229806e4f1fdb171623d8cd94b1d3fbf