Merge "[automerger skipped] Merge "Add public APIs for carrier apps" am: 89a1e85387 am: e11d665aae am: 3911edcd28 -s ours am skip reason: change_id I26d4d9d435dbfbf1e87bef962c6bced057784e0a with SHA1 d5f278e953 is in history"