[automerger skipped] Merge "Disable historical appops" into qt-dev am: 16128cc7a2 am: 4f7f78cce5
am:92eb0205a2-s ours am skip reason: change_id I6debd3cbb6768b256eb558a81ba13efea375769b with SHA11353bc5b76is in history Change-Id: I3fde4bacffac16c78b1fd0ce2d857442230eefec
This commit is contained in: