[automerger skipped] Merge "Rename constant OVERRIDE_* to SUBSCRIPTION_OVERRIDE_*" am: 9783ecda am: 504928f0 am: 41ba5ce4 -s ours
am skip reason: Change-Id I3656406770e2ec77c7fb3b7093c1979a24def9d9 with SHA-1 cb431d3d is in history
Change-Id: I4fe3d591bcdcc77425e6ee1e59affecb1cbd9bbe