Merge "TIF: Add TvParentalControlManager" into lmp-dev

diff --cc api/current.txt
Simple merge

diff --cc core/java/android/app/ContextImpl.java
index ee6cdb7,cc3ad23..2fd3443
--- 1/core/java/android/app/ContextImpl.java
--- 2/core/java/android/app/ContextImpl.java
+++ b/core/java/android/app/ContextImpl.java
@@@ -72,9 -72,9 +72,10 @@@ import android.location.ILocationManage
  import android.location.LocationManager;
  import android.media.AudioManager;
  import android.media.MediaRouter;
 +import android.media.projection.MediaProjectionManager;
  import android.media.session.MediaSessionManager;
  import android.media.tv.ITvInputManager;
+ import android.media.tv.TvParentalControlManager;
  import android.media.tv.TvInputManager;
  import android.net.ConnectivityManager;
  import android.net.IConnectivityManager;

diff --cc core/java/android/content/Context.java
Simple merge

diff --cc core/java/android/provider/Settings.java
Simple merge

diff --cc media/java/android/media/tv/TvInputService.java
index 32cf5da,6670c9c..ecffb7b
--- 1/media/java/android/media/tv/TvInputService.java
--- 2/media/java/android/media/tv/TvInputService.java
+++ b/media/java/android/media/tv/TvInputService.java
@@@ -17,9 -17,7 +17,8 @@@
  package android.media.tv;
  
  import android.annotation.SuppressLint;
 +import android.annotation.SystemApi;
  import android.app.Service;
- import android.content.ComponentName;
  import android.content.Context;
  import android.content.Intent;
  import android.graphics.PixelFormat;

diff --cc services/core/java/com/android/server/tv/TvInputManagerService.java
Simple merge