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