Merge "Fix unused preference recycling" into tm-dev am: 35dbacc01f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Permission/+/18739834

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