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