API getSystemService(Class) was not present in lmp-dev. This reverts commit 89c0dbca. Bug: 35028827 Change-Id: I19846d2a3ee27aecbae2367a74ee49082eea154d