Merge "make sure appwidgetId is correct" into oreo-mr1-cts-dev
am: 4773328146

Change-Id: I2395fbdf61f1a6589a9dc0fd314189c7c0e91d5d