Merge "Add ResourceManager unit tests to presubmit" into qt-qpr1-dev
am: 99ace58391

Change-Id: Ic5ea4481c3e0e731d520591735d75ba49e5147a6