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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3252ce016243a51fe17d70383b9e16293ebd3d99