Merge "reland: untrusted_app_29: add new targetSdk domain"