Merge "Remove clear history button am: 56b4759cdb am: c17bd8da5c am: c9585e1a39" into rvc-qpr-dev-plus-aosp am: 22ba8be1fa

Change-Id: Idf16ef5e3dd094a896bc55b72ef550634b526477