Merge "Replace clearAll with withoutDefaultCapabilities" am: b4c624aece

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

Change-Id: Ibb29c90f818ca6f447d91f0eda0abe0ef82363dd