Merge "Separate 2 tests to verify canBeSatisfiedBy()" am: f01b37a7c2 am: 54527beee2

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

Change-Id: If94d24c57b5f982180b04bad236c524183e4c5af