Merge QP1A.190122.001

Conflicts:
Android.bp
src/java/com/android/internal/telephony/RIL.java
src/java/com/android/internal/telephony/SubscriptionInfoUpdater.java
src/java/com/android/internal/telephony/dataconnection/DcTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneCallTracker.java
src/java/com/android/internal/telephony/imsphone/ImsPhoneConnection.java
tests/telephonytests/src/com/android/internal/telephony/SubscriptionInfoUpdaterTest.java

Change-Id: I61ad15b904f73ea3b3dec5f3b55bf1438d62ea10