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