Merge "NullPointerException for Internet quick panel(slice) in Settings" into sc-v2-dev am: 7d75b59495 am: 7f01205017

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

Change-Id: I1eca0930a7fdbdd257d34713ec940dceecf14398