[automerger skipped] Merge "Make sure mCurrentUsbFunctionsRequested flag be updated currectly" am: 09a47331c9 am: a41d30b5a6
am: 3802c87d44 -s ours
am skip reason: change_id Id8b58d9ccd3f62c976d1292575a06554bef622a4 with SHA1 3b747d3138 is in history

Change-Id: Iaff2064b7e68cae6c94aa02478865fc9e776d430