[automerger skipped] When oppt profile is disabled, make sure to enable the modem stack. am: 54e9be4511 am: abbc3aa1a0
am: e3682f32bf -s ours
am skip reason: change_id I1a5fd0fc26c84a31ca024ed9c441a2a46c8d9533 with SHA1 bc24e5830c is in history

Change-Id: I1145b876322c2534e913b846709c8bf2ce91bac9