Merge "Disable historical appops" into qt-dev
am: 16128cc7a2

Change-Id: I5f3701c4510057aa69dec50c3dbae6c8fce860e8