Merge "Relax Instant Apps Settings whitelist enforcement"
am: c03c63c8bb

Change-Id: I1c14a1b7acb11e3de32e3e31ceccc68c37acf07c