resolve merge conflicts of 81d1cd08 to...

resolve merge conflicts of 81d1cd08 to stage-aosp-master am: 4ec8323b am: 244f21d9 am: 8097546f

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627



Change-Id: I0ed7b6a1178d1827079723b7d3283cbb91981b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>