Merge bab910c on remote branch

Change-Id: I56b8e2e14c9092648f4e7529902cac171115be50

Author: Linux Build Service Account

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -1552,10 +1552,6 @@ void makeFinishingLocked() {
         if (stopped) {
             clearOptionsLocked();
         }
-
-        if (mAtmService != null) {
-            mAtmService.getTaskChangeNotificationController().notifyTaskStackChanged();
-        }
     }
 
     UriPermissionOwner getUriPermissionsLocked() {

services/core/java/com/android/server/wm/ActivityStackSupervisor.java

@@ -1843,6 +1843,7 @@ boolean removeTaskByIdLocked(int taskId, boolean killProcess, boolean removeFrom
             tr.removeTaskActivitiesLocked(pauseImmediately, reason);
             cleanUpRemovedTaskLocked(tr, killProcess, removeFromRecents);
             mService.getLockTaskController().clearLockedTask(tr);
+            mService.getTaskChangeNotificationController().notifyTaskStackChanged();
             if (tr.isPersistable) {
                 mService.notifyTaskPersisterLocked(null, true);
             }

telephony/java/com/android/internal/telephony/gsm/GsmSmsCbMessage.java

@@ -362,6 +362,10 @@ private static Pair<String, String> unpackBody(byte[] pdu, int offset, int lengt
                 }
                 break;
 
+            case SmsConstants.ENCODING_8BIT:
+                body = GsmAlphabet.gsm8BitUnpackedToString(pdu, offset, length);
+                break;
+
             case SmsConstants.ENCODING_16BIT:
                 if (dcs.hasLanguageIndicator && pdu.length >= offset + 2) {
                     // Language is two GSM characters.