Merge \"DO NOT MERGE Block the user from entering safe boot mode\" into mnc-dev
am: 3e582390b3

Change-Id: Ibb90e151746d405e1cc8a1eb889ffa91aca35bc8