Merge "Merge "[pm] fix ConcurrentModificationException in AppsFilter" into udc-dev am: 66250a05" into udc-d1-dev am: 9d57d960 am: 27480b68

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23049456



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