[automerger skipped] Add kUpdateStatusCleanupPreviousUpdate. am: 4b3c76a71e am: 5a59b94d97 am: 62a171fbb7 am: 5bc6891da7 -s ours am: 3effc4e58a -s ours
am skip reason: Change-Id I63160745c5904597d4faf573a556ada753674b9f with SHA-1 2e466f96bc is in history

Change-Id: I288e1e99038d2f5fb7a2fe4a167fac772ac1f801