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

Change-Id: I8765690a23776f001bc0941de61b473fa7276fbf