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

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

Change-Id: I007f3d880f7eae016f92c21bb585580eadec30db