Merge "Check deferred overrides when querying compat fw" am: 35821e134d am: 16b7eca431

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83ebe8315b838a95761a3fbac45a0fdafeb62a73