Merge changes from topic "am-551fb4ad91ea487f8283d44e5a3c01a2"

* changes:
  [automerger skipped] Merge changes from topic "migrate_CtsStagedInstallTest_RollbackTest" am: 63e6d6af am: 00190cf8 am: c376fb68 -s ours am skip reason: change_id I5e5c154758b3f0e4731696c813519ac798fbbae9 with SHA1 a859e8af is in history
  [automerger skipped] Increase timeout in testNativeWatchdogTriggersRollback am: 5f01cb92 am: 5a6df151 am: 3a86bcee -s ours am skip reason: change_id I2a98e71102fc1cbf6ea712e070d6db49cdb05cba with SHA1 56d58a04 is in history
  [automerger skipped] Fix flaky testEnableRollbackTimeoutFailsRollback test am: 1d66bf8c am: 79e8fcb4 am: 4371b2a0 -s ours am skip reason: change_id Id94d5452836b07d6f802758bd0dfdd3c276a3c05 with SHA1 b61fac95 is in history
  [automerger skipped] Wait for available rollbacks in RollbackTest. am: 77a40731 am: 170a5198 am: 129a2c09 -s ours am skip reason: change_id I27e2513b34f49af2f41cd627a5d2550541831e11 with SHA1 0a3c06e9 is in history
  [automerger skipped] Include NewRollbacks in result of getAvailableRollbacks. am: dc4a3610 am: b63dfa2d am: eb559106 -s ours am skip reason: change_id I015ee5925e38118c40f4b9e145f78fb12c0e2890 with SHA1 0672808c is in history
  [automerger skipped] Rename RollbackData to Rollback. am: 91fc4db1 am: b646e555 am: d0d7a014 -s ours am skip reason: change_id I5ae3866753d6badcdf019525b40522937568dee5 with SHA1 8d512eeb is in history
  [automerger skipped] Remove INSTALLED_USERS extra from ACTION_PACKAGE_ENABLE_ROLLBACK. am: 87a504d1 am: 682e501c am: ab81c07b -s ours am skip reason: change_id Iffd63977a7498e3cba20d2039af623c921d38f57 with SHA1 48f3cf47 is in history
  [automerger skipped] Update to new RollbackUtils.sendCrashBroadcast API. am: 3e7ef5ae am: a39bd708 am: 6ff24063 -s ours am skip reason: change_id Iaaa728aa58d894ba546677e8295faba2ebfc5e64 with SHA1 0c03aaae is in history
  [automerger skipped] Extend ROLLBACK_COMMITTED broadcast for the multi-user case am: e92720dd am: 4bcb79bb am: e243c751 -s ours am skip reason: change_id I8e20da321f52ebf9e6d584a8c59d2a3106a32212 with SHA1 65e90bab is in history
  [automerger skipped] Fix NullPointerException. am: b4bad064 -s ours am: d0654a76 -s ours am: 21640f38 -s ours am skip reason: change_id Ic007e44264647793c6271c3923c13c9e1736a9de with SHA1 17bfed91 is in history
  [automerger skipped] Cleanup some obsolete TODOs and unused code. am: cda1a175 am: 01178b4f am: 38467d7e -s ours am skip reason: change_id I67610d3467d737cbfc085f00ea0b509b63f4612b with SHA1 d006f756 is in history