[automerger skipped] Merge "Update documentation for setSubscriptionOverride" am: ab9f5d46b2 am: 068a7ae94c -s ours am: 1efede8af8 -s ours am: 8d524dd118 -s ours
am skip reason: Merged-In Iebfcd0ece1891c1b77d132b92e93d8c1eea3aa6e with SHA-1 f7e9c836c4 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1727132
Change-Id: I61125c4b923ce53d03883b80b1bc1edc34f818d4
This commit is contained in: