Merge "Replace HashSet with memory efficient ArraySet collection" into tm-dev am: 6cf229c922 am: b85a395fc4

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

Change-Id: I7229c8e973964a36a8c31ccffd376c00cb7b9136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>