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

Change-Id: I85e3f248dd050559cca12dc388880109bb970bcf