Merge "Don't require seinfo for privapps" am: 4a0df6c499 am: a8173ef21e
am: 3d60d04935

Change-Id: I25553760e98b4e7b8ec21f1ad497fea978ed9b7d