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

Change-Id: I39a8e92e53230a49e731cb0af7b72b0a58d2c8cc