Merge "Merge "Add target sdk check for behavior change." into oc-dev am: e5e246ce5c am: 4e76728dea" into oc-dr1-dev-plus-aosp
am: 5f40d83476

Change-Id: I3ef0603edd519f31224eca164371758d74948787