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

Change-Id: I3f08646d7d2be5bf10e2e2cb4ba9dbd0b1f9a844