* commit '2f16e670191cfc6a5e6e5f293f37c0b546d82cdf': Remove userActivity() from Settings now that it's managed by FingerprintService
* commit '2f16e670191cfc6a5e6e5f293f37c0b546d82cdf': Remove userActivity() from Settings now that it's managed by FingerprintService