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