Merge "Fix for, BT Carkit position issue when music app is killed" am: 43425b6f4f
am: 4791a5112b

Change-Id: I3b04cc3bb13d2c6c6f810eef2d2b0a8ebe5775ec