Merge "Move AWakeLock from foundation to libmediaplayerservice"