Changing user inactivity and warning dialog timeouts am: cafdc2e50d am: 925a30e82b
am: c32b08da9d

Change-Id: I66bf2285bc9403a7b0f2fe5b5d93d86cc08209c9