Merge "frameworks/opt/calendar: Set LOCAL_SDK_VERSION where possible." am: 03dbebcdc8
am: 7d5a0a9ef7

Change-Id: I456a55497b102a8fce0296f9d6fa9a93845f4dba