Merge tag 'android-security-14.0.0_r14' of...

Merge tag 'android-security-14.0.0_r14' of https://android.googlesource.com/platform/frameworks/base into lineage-21.0

Android security 14.0.0 release 14

* tag 'android-security-14.0.0_r14' of https://android.googlesource.com/platform/frameworks/base:
  Restrict access to directories
  RESTRICT AUTOMERGE Clear app-provided shortcut icons
  Disallow device admin package and protected packages to be reinstalled as instant.
  Set no data transfer on function switch timeout for accessory mode
  Check more URIs in notifications
  RingtoneManager: allow video ringtone URI
  Remove authenticator data if it was disabled.

 Conflicts:
	core/java/android/app/Person.java
	core/java/android/widget/RemoteViews.java
	packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
	packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcutListSearch.java
	packages/SystemUI/src/com/android/systemui/statusbar/KeyboardShortcuts.java

Skipped commit 4677d3ee from the merge, will be applied separately

Change-Id: I27994822ef03e12452f1092476dfb81b0339b995