Merge "DO NOT MERGE:  Temporarily disable unsupported sdk warning for P during finalization" into pi-dev
am: 7c3f7dd9a5

Change-Id: Ib21b3fdef4c29e43ff385fa3fce5491b381b8530