resolve merge conflicts of 81d1cd08 to...

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

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



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