Merge "Allow developer options in retail mode" into pi-dev
am: 0f4545ac64

Change-Id: Idf9fb0805d81e6078ed8bdb029c6f885b0813004