[automerger skipped] db845c: Sort manifest.xml entries am: 536e2b2768 -s ours am: 6b01f9b292 -s ours
am skip reason: Change-Id I4a8dfd4a17aa5d8ea343e851b50f0d7da49de033 with SHA-1 5387f5a37e is in history

Change-Id: Ia0ba76f9d47317efacf23a3b9250aaa8ba109c09