[automerger skipped] packages/apps/Settings: Set LOCAL_SDK_VERSION where...
[automerger skipped] packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE am: 47e671e1 -s ours
am: d508e737 -s ours
Change-Id: I495a1e05eb005ad9675fc7cf566c2a96d4b93030