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

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

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