Merge "Clean up the no-history entries while the app died" into sc-v2-dev am:...

Merge "Clean up the no-history entries while the app died" into sc-v2-dev am: f7f93694 am: d8304cd2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15878942

Change-Id: If18bdecf64c52a451704e81a6bcd64329a5eabd9