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

Change-Id: Iacc54f9146a9644b3afb15c802e78fc433c3ec1a