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