[automerger skipped] Merge "Supported data enabled override for different scenarios" am: 3a0e57df0a
am: 185f998c87 -s ours
am skip reason: change_id Ibb2c327cc58de19d2df1f9f2a57b3cf9c39a57fc with SHA1 e9e9cb3d51 is in history

Change-Id: I26eb369ef2dd62756874e08a423d48b6a46d2b11