Merge "[DO NOT MERGE] Remove --history from dumpsys appop" into qt-dev