Merge tag 'android-9.0.0_r42' of https://android.googlesource.com/platform//packages/apps/Settings into HEAD

Android 9.0.0 release 42

Change-Id: Ibd2f10f974e61e76c4148395ee0d1a4e2e43a6ed