Merge "Fix framework side of #7132432 com.android.vending:..." into jb-mr1-dev