Merge "Disregard the API list a method/field is a part of when checking if it is part of the filter list for hidden APIs." am: 9774f4aeb2 am: 824a729920

Original change: https://android-review.googlesource.com/c/platform/cts/+/1466460

Change-Id: I84e54d0330f5a8c0c1cb3b8e020f8213f20a6496