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

Change-Id: I905294f12e2bd4736788500a8576bbff68db6f96