Merge "Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev am: 08e24d43b6
am: 6193fb90ae" into nyc-mr1-dev-plus-aosp
am: 2a94bc34df
* commit '2a94bc34df4d0354359ac24ec1cec79e3c039557':
Change-Id: I216b512d7cc4e82af0ef9556ed46e6c64a28657e
This commit is contained in: