[automerger skipped] Merge "Mainline API - Make a new method for...
[automerger skipped] Merge "Mainline API - Make a new method for Intent.resolveSystemService" am: 088ac9c5 am: d0466c0d am: 72ac3d61 -s ours
am skip reason: Change-Id I0c418220c61154300daf0c9e0487c9b6cb031f27 with SHA-1 b307d623 is in history
Change-Id: Ib77c711a551e4836f77799894b5aadd60e91f58d