Merge "Remove framework code that has moved to frameworks/libs/net" into stage-aosp-master