[automerger skipped] Merge "Add setSubscriptionOverride() to system API" am: f734372173 am: ce4e22638c am: 54b69b5ab7 -s ours
am skip reason: Change-Id I56c777aa66d6f455695f133f9889979c13cd1bc8 with SHA-1 2d471ca1e1 is in history

Change-Id: I4169ab03caebd6caf0f0694b6636abbe7116e861