Merge "packages/providers/PartnerBookmarksProvider: Set LOCAL_SDK_VERSION where possible." am: 6a41008120 am: e2183c2f7e
am: ac8bb2648d  -s ours

Change-Id: I57ffbfae97d937b9d037d2c3964c4f7a133bf95f