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

Change-Id: Ia999e7deec13087cb0084b21b737fbff7aaf0bf4