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

Change-Id: I86fd07718e88387d914eca0177f5ab8b824a168f