Merge "Remove CONNECTIVITY_ACTION and INET_CONDITION_ACTION" am: 50d1eb59a4 am: 8f834c68bf am: 75b719adf1 am: 5759c2352a am: c871472fb8

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1432493

Change-Id: I6c90559a147474a504edb1ca3f4455de8ea1dff6