[automerger skipped] Merge "Remove System APIs not required for R" am: f5f137b9d3 am: 630aacdc73 am: f202e1109a -s ours
am skip reason: Change-Id If022a726a058a90cb5446d220628c76800da8e96 with SHA-1 567a91279f is in history

Change-Id: I83430fd7e88c557d690ce540005e53d00bb22132