[automerger skipped] Merge "Construct a ArrayList for emergency Urn" am: f9cdd07f
am: 602b2c2f -s ours
am skip reason: change_id I3857e9cb73684df2c110a5bcc06d1c845b810ee4 with SHA1 d9bd0f8a is in history
Change-Id: I3149a1249e40696db95d9a15fd90a7af4880a65e