Merge "OPP: Fix the NPE in OPP service when stop() is called before start()."
am: 8206e2a0e3

Change-Id: I8478ee8607d38964e4ee960601020ca20dbde45a