UX requested that we have the settings directly in Security instead of having a separate screen as implemented previously. Bug: 26806582 Change-Id: I55c44848621498afe63d3207a52c974c58f9eb78