am 5cf2a139: am c172688d: (-s ours) am c7403258: Reconcile with ics-mr0-release ics-factoryrom-2-release

* commit '5cf2a1399e8cd047e84e159e25c74c259882f52c':
  Fix bug in TextLayoutCacheKey handling embedded nulls.
  DO NOT MERGE Cherry pick from ics-mr1 - Bug 5275928 - Don't try to open an overflow menu under invalid circumstances.