[automerger skipped] Merge "Supported data enabled override for different scenarios" am: 8959a121ce
am: d348075221 -s ours
am skip reason: change_id I2266d7f428901ccbba6bf538a7c7696e6566b96c with SHA1 0d26d718b3 is in history

Change-Id: I57430c67a10c09ddc12309392544b72c0cad29b4