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

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

Change-Id: Ia267eefaa1244ff3de8777c78f6164a3ff45e735