Merge "packages/apps/Settings: Set LOCAL_SDK_VERSION where possible. DO NOT MERGE"
am: 02e3229580  -s ours

Change-Id: I24575750c99fe081f28ea7a5f73307e3bfd8c950