Merge "Fix invalid size in intent resolution filterApprovedApp" into sc-dev am: cfbcacab am: 9a492aa4

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

Change-Id: I8308efccfbaf84dea73f5d84b4cdac2300ea04c8