Bug: 114236837 Test: ./gradlew :afservice:installDebug Test: ./gradlew :Application:installDebug Change-Id: I69a2f2bd37bbd19b0861e73664abc48d17c26d79 (cherry picked from commit fb731854)