[automerger skipped] Merge "Add System API to indicate whether a subscription...
[automerger skipped] Merge "Add System API to indicate whether a subscription can be disabled." am: bc8e0b1a am: aebaf7eb
am: bffcc3b0 -s ours
am skip reason: change_id Icceae37faf6a87b7176e60ac633f9affac98f375 with SHA1 ee84b698 is in history
Change-Id: I9ed5c8775c77b315b10078332c4ace6877885331