Merge "Relax Instant Apps Settings whitelist enforcement" am: c03c63c8bb am: d0c2fe9f0a
am: 29f3cd12a6

Change-Id: I605bad6af0a9c03d394b5c7a78bace04543dbe20