Merge "Restrict visibility into the sdkext package" am: 3ede866f2e am: 2b56e7f529

Change-Id: Ia2ef4e898d5ac70389da7a72afcee61a36230997