Snap for 8589293 from 12667ed42f947457d893d6f7faf8ce30e3a5d037 to sc-v2-platform-release

Change-Id: I29088d91fc27d66f2a4821dec49df8c6919ee7a4
diff --git a/RotaryPlayground/AndroidManifest.xml b/RotaryPlayground/AndroidManifest.xml
index 8877af4..f526657 100644
--- a/RotaryPlayground/AndroidManifest.xml
+++ b/RotaryPlayground/AndroidManifest.xml
@@ -20,6 +20,10 @@
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Theme.App">
+        <!-- Define app-specific custom off-screen nudge right action: KEYCODE_BACK. This action
+             works only when this application is in foreground. For a given activity, this action
+             can be overridden by the action specified in that activity. -->
+        <meta-data android:name="nudge.right.keyCode" android:value="4"/>
         <activity
             android:name=".RotaryActivity"
             android:label="@string/app_name"
@@ -32,7 +36,8 @@
             <!-- Define app-specific custom off-screen nudge up action:
                  GLOBAL_ACTION_NOTIFICATIONS -->
             <meta-data android:name="nudge.up.globalAction" android:value="4"/>
-            <!-- Define app-specific custom off-screen nudge left action: KEYCODE_BACK -->
+            <!-- Define app-specific custom off-screen nudge left action: KEYCODE_BACK. This action
+                 works only when this activity is in foreground. -->
             <meta-data android:name="nudge.left.keyCode" android:value="4"/>
             <!-- Define app-specific custom off-screen nudge down action: launch Settings -->
             <meta-data