Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17944586 Change-Id: I7d8f18cf99bdc67218b9c50feff07835e85efc10 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>