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

Change-Id: I255e17d94623c878d6859528c32260186ce6be09