[automerge] Fix some history issues 2p: 4d46dddbe7

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594

Change-Id: Ia4166d749cab1f571f2becec77b3dfae996d5101