Update remountUidLegacy to handle "full" mount mode. am: 36bdf7ab54
am: 08a7e13025

Change-Id: I4bcfd41b5bb85c0b69839cbdffa03b2aa5debd45