Merge "Remove ldaps from AOSP code." into lmp-dev