[automerger skipped] Merge "Update watchdog value" am: 579fb5fe58 am: 98554cf1ff -s ours am: 65592dc8be -s ours am: 774264f205 -s ours am: 512d08f256 -s ours
am skip reason: Change-Id I9e4bdb3a5dd9c6b476540f3c90304657986e17c3 with SHA-1 e2642adac5 is in history
Change-Id: I6f01de43068d491acf4500c772f22c2417bef0f5
This commit is contained in: