[automerger skipped] Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece am: f27534ba53 -s ours
am skip reason: Merged-In Ida8d25d57504864f046e3403f593cc606fbfe982 with SHA-1 df9611cab7 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1708330
Change-Id: I7c3a7d6d8ba6b93546d0b436f2d63ab2ae1d2bb9
This commit is contained in: