ag/16428878 has been cherry picked to AOSP, but
without the changes on new DataServiceManager. Making
this dummy change here to prevent merge conflict.

Test: None
Bug: 208651109
Change-Id: Ib0619edaf2c8753efd7d665053a5b5775bc00dcb