Changing user inactivity and warning dialog timeouts
am: cafdc2e50d

Change-Id: Iba74fd833ba00cbae39e09cf404f1877efd7a4d8