Merge "Limit bypass staged installer API to system and shell only" into...
Merge "Limit bypass staged installer API to system and shell only" into rvc-dev am: e91800d2 am: 71fa5796 am: 5424c7c7 am: b6a93217
Change-Id: Ibee8b985d7249a8465d17b33e4f3d5b7eeb8accf