Merge "packages/apps/OneTimeInitializer: Set LOCAL_SDK_VERSION where possible." am: 51e07426b1 am: ecba4c1d6b
am: 3418fa2e89

Change-Id: If166e7554f61f686b917c72d07c18e738141244f