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

Change-Id: Icda7a9f9ad587d2c2e76b4e58049d6c989ce0140