[automerger skipped] Merge "Add @UnsupportedAppUsage annotations for max-p." am: 8893f158c6 am: da4d6567c2
am: 3be4d59369 -s ours
am skip reason: change_id I5aa29a49b193db47aaee4d3a756c17f48cc9f0b1 with SHA1 70507ed5a1 is in history

Change-Id: I48d2d4d2b0dbf20bd2954b67909f5722cdd62a93