Merge "Hides the Save UI while handling a pending intent from CustomDescription." into oc-mr1-dev
am: 55309e79cf

Change-Id: I77d7a6e10d33b5e983d7652613c752829a886b01