[automerger skipped] Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev am: 7c3f7dd9a5
am: 207e66ecca  -s ours

Change-Id: I6641baca7362b76e15cd785e2f0ed9b67baed1b5