[automerger skipped] Merge "Use setServiceForTest instead of static mocking"...
[automerger skipped] Merge "Use setServiceForTest instead of static mocking" am: 0e1c8c09 am: b343871c -s ours
am skip reason: Change-Id Iada89e246faaeb13dc724c9b7591350bbad2b177 with SHA-1 b67930c3 is in history
Change-Id: I53269e7e6e920f42a1c3d7801b69ffeb49067196