Merge "Not allow shell to dump screen by using ui-automator if... DISALLOW_DEBUGGING_FEATURES is set" into pi-dev am: b2c4a55405
am: 5351429200

Change-Id: I65a7c29f4b7a031bd931d5b31192456734e9616d