[automerger skipped] Merge "Remove packages/Connectivity" am: 996ae3fb am:...

[automerger skipped] Merge "Remove packages/Connectivity" am: 996ae3fb am: b0927a02 -s ours am: c2742b72 -s ours am: 5ce1a732 -s ours

am skip reason: Merged-In I2ed1fb00a7780c488c40d27590f206031fe033f2 with SHA-1 f69a7d09 is already in history

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

Change-Id: Idcbe0716f2261abcf96454088953d1d9581a4d29