Fix typo in AndroidManifest.xml

Change-Id: I1f9012f6b4ac3553879e7c780724103aa35093b6
Automatic translation import

Change-Id: I2aa37009acfdd679fdebf671c8d21c7b5e96cca3
Bluetooth: MAP: Close output stream before closing client session

Body field is not added on the put request if we close the client
session before output stream. Hence add change to close output stream
before client session.

CRs-fixed: 623805

Change-Id: I73bbf06ca9bcceb465e196f58d8d4dda19005861
Automatic translation import

Change-Id: Ib5909ca10706f41bb3d51ba2d5e97752dee3d00b
Merge branch 'cm-11.0' into stable/cm-11.0