Merge changes from topic "am-954a030309c64978b41606db6164aed0" into tm-d1-dev-plus-aosp
* changes: [automerger skipped] Merge "Skip sending VpnManager events for Settings VPNs" into tm-dev am:fab86f9cce-s ours am:efbe51bea1-s ours [automerger skipped] Skip sending VpnManager events for Settings VPNs am:a7ec0cbe45-s ours am:b611c83fee-s ours
This commit is contained in:
committed by
Android (Google) Code Review
commit
34f2e6aa22