Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: 0481dea94a

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

Change-Id: If50087f55d60e84a4ebd9e117210b0028996b1f6