Merge cherrypicks of [2286405, 2286309] into ub-testdpc-oc-release

Change-Id: I10eff87c31863f8ac324197862ec2cd54b345824

Author: android-build-team Robot

app/build.gradle

@@ -9,7 +9,7 @@ ext {
     // exactly 1 digit
     versionMinor = 0
     // exactly 2 digits
-    versionBuild = 01
+    versionBuild = 02
 }
 
 android {

app/src/main/AndroidManifest.xml

@@ -137,14 +137,16 @@
         </receiver>
 
         <receiver android:name=".policy.resetpassword.ResetPasswordService$LockedBootCompletedReceiver"
-            android:directBootAware="true" >
+                android:enabled="@bool/is_o_or_later"
+                android:directBootAware="true" >
             <intent-filter>
                 <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
 
         <service android:name=".policy.resetpassword.ResetPasswordService"
-            android:directBootAware="true" >
+                android:enabled="@bool/is_o_or_later"
+                android:directBootAware="true" >
         </service>
 
         <provider