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

Change-Id: Ic7203f8751d24db1e218c6e05bde0c25f0af2216