Merge "Remove CONNECTIVITY_ACTION and INET_CONDITION_ACTION" am: 50d1eb59a4

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

Change-Id: Ibddd1595cc8b36c2cc18e9ed1901adc7a9b12330