Android p preview 5
Merge "Revert "Update SubscriptionInfo constructor""