resolve merge conflicts of 9cc3a580 to stage-aosp-master am: 8ba28103

am: 47566d65

Change-Id: Ic3dc41cdec449d9ef67c41d08cbbf83d293654b5

app.te

@@ -451,3 +451,9 @@ neverallow {
 # Foreign dex profiles are just markers. Prevent apps to do anything but touch them.
 neverallow appdomain user_profile_foreign_dex_data_file:file rw_file_perms;
 neverallow appdomain user_profile_foreign_dex_data_file:dir { open getattr read ioctl remove_name };
+
+# Applications should use the activity model for receiving events
+neverallow {
+  appdomain
+  -shell # bugreport
+} input_device:chr_file ~getattr;