Merge "Add user restriction to suppress error dialogs."

author Charles He <qiurui@google.com>

Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)
author Charles He <qiurui@google.com>
Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)
diff --cc api/current.txt
Simple merge
diff --cc api/system-current.txt
Simple merge
diff --cc api/test-current.txt
Simple merge
diff --cc services/core/java/com/android/server/am/ActivityManagerService.java
Simple merge
author	Charles He <qiurui@google.com>
	Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 10 Oct 2017 19:45:12 +0000 (19:45 +0000)
		1	2
api/current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/system-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
api/test-current.txt	patch \|	diff1 \|	diff2 \|	blob \| history
services/core/java/com/android/server/am/ActivityManagerService.java	patch \|	diff1 \|	diff2 \|	blob \| history