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