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

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

Change-Id: Ifd3bfdd17efdd12b4e0aa49a83d96d570d3942dd