Merge "Clean Safety feature flag for CarDeveloperOptions." into qt-dev
am: c4e7bc197b

Change-Id: I2387f315ccb10cb17e0bcb621270fb0f2afeda12