Merge "[automerger skipped] Merge "[PATCH] DO NOT MERGE: Whitelist intents in Honeywell com.redbend.app" into oreo-mr1-cts-dev am: 98c257d2d9  -s ours" into pie-cts-dev am: b2f2523e81  -s ours
am: 544448140a

Change-Id: I48b8123e24469552827c80c3fcd24f0deff76ec2