Merge "Remove clear history button am: 56b4759cdb am: be003f6466" into rvc-d1-dev-plus-aosp