Merge "Merge "Actually inject TargetSdkResolver" into rvc-dev am: 85c3e4d6d2 am: 603d1bddab" into rvc-d1-dev-plus-aosp am: 2bd5def305
Change-Id: I68dc447eb94e71b87a9c4ceb84fcd90fb5bbc4b8
This commit is contained in: