Merge "Add an exported flag in manifest" am: f78221dc79

Change-Id: Icab4ae1b328f6780a7ad4ba18b683c1aa5927c26