[automerger skipped] Merge "Disable historical appops" into qt-dev am: 16128cc7a2 am: 0ed8440bba
am: b114edfc19 -s ours
am skip reason: change_id I6debd3cbb6768b256eb558a81ba13efea375769b with SHA1 1353bc5b76 is in history

Change-Id: If1501f3004a04822d63b6eb390271748e120f304