[automerger skipped] Merge "Support WAC decoding in UMTS format" into qt-qpr1-dev am: b55bf00418
am: 919efcaf54 -s ours
am skip reason: change_id I73dc22c27c2cfd47000ae65448fbc857ed9aa42f with SHA1 e3f37275ae is in history

Change-Id: Ie30bae6d2bcc70d817a32aa371d4e729018029af