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