[automerger skipped] [DO NOT MERGE] Update target SDK skipped: 2156b3a0a1

Change-Id: I9edba2d1baeb5b6b838bd5a29b9c9b384b0d4629