Fix ISE in History page (DO NOT MERGE)

Corresponding change in master was https://android-git.corp.google.com/g/#change,95446
Bug: 3427773

Change-Id: Iaa7a5620285797cd6d3e15e9f5e058ca553a5951
1 file changed