Merge "Fixes resource file exemption." am: 888759dd9f am: b6050b438d am: b1963ab733

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2395652

Change-Id: I42e717ae98f2427bdf92be78e46be9ab15666ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>