Merge "Add some TestAPIs for replacing some @hide API usages in ExtServices's test" into sc-dev