Merge "packages/apps/BasicSmsReceiver: Set LOCAL_SDK_VERSION where possible." am: 1de7ec51f2
am: 471e5acdad

Change-Id: I41e98aeabae83fa6af32cf355274711bc6b283fe