resolve merge conflicts of 9cc3a580 to stage-aosp-master

am: 8ba28103

Change-Id: I0f6d2305b824a9793faaab75e92715172fc30880

app.te

@@ -435,3 +435,9 @@ neverallow appdomain {
 # 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;