Merge "Fix some history issues" into tm-dev am: b28925ad48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594 Change-Id: Ib20da3b6a4d75fab7fd4aef8b3acf35216c9643c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: