[automerger skipped] Merge "Add new SystemApi methods for mainline" am: f363f3549e am: 5925c3bb29
am: a49279775f -s ours
am skip reason: change_id I458ba6bcfc03db72c0419b0cab2f0d0adfa971d4 with SHA1 e2f17aad5e is in history

Change-Id: Icf01ba5240d028a85acd4a845b0cdf6e67ce90cc