MapClient compatibility updates

Update MAP client code to ensure compatibility with latest
specifications, and ability to pass associated tests.

Bug: 148967271
Bug: 148969955
Bug: 148971116
Bug: 148972572
Test: PTS MAP/MCE
Change-Id: I1fdf87b09cec658a6496b3e6a6ca4a48aeeb8d42
Merged-In: I1fdf87b09cec658a6496b3e6a6ca4a48aeeb8d42