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

Change-Id: I37e08077152850e290b71cf9ceadbff374dd4183