Merge "Remove ParcelableException from AppSearch." into sc-dev